Revision: bazaar--merge--1.1--patch-19
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Thu Jan  6 19:31:19 EST 2005
Standard-date: 2005-01-06 08:31:19 GMT
Removed-files: tests/test-archive-setup.sh
Modified-files: baz/baz.c commands/archive-setup.c
    commands/branch.c commands/cmds.c commands/cmdutils.c
    commands/cmdutils.h commands/import.c
    commands/make-branch.c commands/make-category.c
    commands/make-version.c commands/resolved.c
    libarch/changeset-utils.c libarch/make-changeset.c
    tests/Makefile.in tests/test-framework
    tests/test-import-baz.sh tests/test-import.sh
    tests/test-merge.sh tests/test-tag-baz.sh
    tests/test-tag.sh
New-patches: jblack@gnuarch.org--2004/baz--copyright--1.1--base-0
    jblack@gnuarch.org--2004/baz--copyright--1.1--patch-1
    jblack@gnuarch.org--2004/baz--tolint--1.1--patch-1
    jblack@gnuarch.org--2004/baz--tolint--1.1--patch-2
    jblack@gnuarch.org--2004/baz--tolint--1.1--patch-3
    rob.weir@canonical.com--2004-public/baz--bug4697--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4697--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4702--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4729--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-3
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-19
    thelove@canonical.com/bazaar--devo--1.1--patch-77
    thelove@canonical.com/bazaar--devo--1.1--patch-78
    thelove@canonical.com/bazaar--devo--1.1--patch-79
    thelove@canonical.com/bazaar--devo--1.1--patch-80
    thelove@canonical.com/bazaar--devo--1.1--patch-81
Summary: merge from thelove@canonical.com/bazaar--devo--1.1
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--copyright--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-73

 * jblack@gnuarch.org--2004/baz--copyright--1.1--patch-1
   Fix up copyright line for regexps.com

 * jblack@gnuarch.org--2004/baz--tolint--1.1--patch-1
   Removed make-(branch|category|version) and archive-setup, fixed import to not be dependant upon them

 * jblack@gnuarch.org--2004/baz--tolint--1.1--patch-2
   Adding a include for archive-setup

 * jblack@gnuarch.org--2004/baz--tolint--1.1--patch-3
   Fixed the tests for the command removal

 * rob.weir@canonical.com--2004-public/baz--bug4697--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-74

 * rob.weir@canonical.com--2004-public/baz--bug4697--0--patch-1
   Note that 'resolved' can't handle filenames yet, fixing #4697.

 * rob.weir@canonical.com--2004-public/baz--bug4702--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-74

 * rob.weir@canonical.com--2004-public/baz--bug4729--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-62

 * rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-1
   Add -d option to branch which shifts directory before doing stuff.

 * rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-2
   Make . the default directory.

 * rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-3
   Use tla in the tests, since it's a shell wrapper for the current baz.

 * thelove@canonical.com/bazaar--devo--1.1--patch-77
   Fixed up the copyright with baz --version

 * thelove@canonical.com/bazaar--devo--1.1--patch-78
   Note that 'resolved' can't handle filenames yet, fixing #4697.

 * thelove@canonical.com/bazaar--devo--1.1--patch-79
   (This is the actual code for updating tree-lint help and removing several make-(branch|category|version) archive-setup commands

 * thelove@canonical.com/bazaar--devo--1.1--patch-80
   Give more sensible errors when 'switch' gets the wrong number of arguments, fixes: #4702.

 * thelove@canonical.com/bazaar--devo--1.1--patch-81
   Give 'branch' a -d option, fixes #4729.

